Revision: bazaar--devo--1.2--patch-22
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Sun Feb 13 15:39:34 GMT 2005
Standard-date: 2005-02-13 15:39:34 GMT
Modified-files: libarch/build-revision.c
    libarch/build-revision.h libarch/library-txn.c
    libarch/library-txn.h libarch/namespace.c
    libarch/namespace.h libarch/pfs-sftp.c
    libarch/pfs-sftp.h libarch/pfs.c tests/test-switch.sh
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-1
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-2
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-3
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-4
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-5
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-6
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-7
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-8
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-9
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-10
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-11
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-12
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-13
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-14
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-15
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-16
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-17
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-18
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-19
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-20
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-21
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-22
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-23
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-24
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-25
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-26
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-27
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-28
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-29
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-30
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-31
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-32
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-33
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-34
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-35
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-36
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-37
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-38
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-39
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-40
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-41
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-42
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-43
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-44
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-45
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-46
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-47
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-48
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-49
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-50
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-51
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-52
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-53
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-54
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-55
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-56
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-57
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-58
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-59
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-60
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-61
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-62
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-63
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--base-0
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-1
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-2
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-3
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-4
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-5
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-6
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-7
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-8
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-9
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-10
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-11
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-12
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-13
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-14
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-15
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-16
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-17
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-18
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-19
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-20
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-21
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-22
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-23
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-24
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-25
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-26
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-27
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-28
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-29
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-30
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-31
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-32
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-33
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-34
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1.2--base-0
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0--patch-11
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--local--1.2--patch-45
    aaron.bentley@utoronto.ca--tla-2004/tlasrc--local--1.2--patch-46
    robert.collins@canonical.com--general/bazaar--backbuilder--1.2--base-0
    robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-1
    robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-2
    robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-3
    robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-4
    robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-5
    thelove@canonical.com/bazaar--devo--1.2--patch-22
Summary: integrate Aarons backbuilder into mainline
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-1
   Refactored arch_build_revision, preparing for backwards build

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-2
   Fixed bug determining previous revision data, and whitespace 

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-3
   Star-merged in robert's merges of my patches.

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-4
   made arch_build_revision into a wrapper for build_revision

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-5
   removed unnecessary inode-sig generation

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-6
   Removed recursion from the archive patching routines

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-7
   moved apply_revisions out into arch_build_revision

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-8
   removed recursion from build_revision

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-9
   Separating revision choice from patch-list

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-10
   Started using make_patch_list to find/apply patches

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-11
   reversed order of patch_list

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-12
   renamed and reorderd make_patch_list parameters

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-13
   Consolidated code for copy_cached_revision and copy_import_revision

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-14
   Got back and forward building working

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-15
   Fixed crash bugs, fixed direction bugs, optimized find_for_revision

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-16
   Worked on library search (broken)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-17
   Fixed up library seeking and building

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-18
   Generalized and cleaned up code

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-19
   Fixes for continued archives

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-20
   Tweaked status messages, removed commented-out code

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-21
   Restored cacherev/import seeking

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-22
   Cleaned up build_library_forwards, tweaked archive_revision_cost

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-23
   Cleaned up find_library_backwards(), fixed seeking in arch/pristine

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-24
   Closed archives properly when done with them in find_library_backwards

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-25
   Fixed memory and archive connection leaks in make_patch_list()

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-26
   Refactored to create find_library_patchlist and patch_direction

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-27
   Fixed order of declaration vs assignment 

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-28
   Fixed silly error patch_direction

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-29
   Fixed bug when building forwards from a revlib

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-30
   Merged with Robert Collins integration

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-31
   Pulled in the latest tla--integration (warning fixes)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-32
   Fixed warnings

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-33
   Applied my merged fixes to the warnings code

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-34
   small code cleanup

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-35
   Merged with Robert, fixed the first build-revision conflict

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-36
   Added latent code for handling tag-based branches properly 

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-37
   Started using the recently-implemented functions.  Getting segfaults

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-38
   Successfully building using scanning, but not fully tested

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-39
   Switched to using full_revision () instead of doing it manually

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-40
   Removed unused find_library_backwards ()

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-41
   More work on getting the right patchlist

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-42
   Fixed chatter message

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-43
   Improved handling of continuations and archives.  Tweaked chatter

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-44
   Applied latest changes from rbtcollins integration

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-45
   Switched to using the archive revision from scan_archive ()

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-46
   Got pristines treated like library revisions wrt standard building

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-47
   Ensured that later revisions in the library are actual descendants

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-48
   Reduced chatter

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-49
   Chatter updates

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-50
   Fixed crash bug where 0-length revision lists are used

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-51
   Fixed bugs re: locating archive revisions & continuation lists

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-52
   Handled the import revision case properly

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-53
   Better error when revision cannot be built

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-54
   Added chatter when an ancestor archive isn't registered

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-55
   patched memory leak

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-56
   Fixed tla update crash due to null archive pointer

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-57
   Fixed bug unearthed in timestamps wrt copying from a different archive

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-58
   apply-delta'ed into tom's tree so that make test passes

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-59
   Changed arch->name to arch->official name where it seemed to make sense

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-60
   Merged tla--devo--1.3

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-61
   devel: Removed some backbuilder chatter

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-62
   Changed scan_archive interface because mid-version imports are legal

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-63
   refactored direct_descendant out of find_patchlists

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--base-0
   tag of aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--0--patch-24

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-1
   applied the latest from --0

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-2
   Merge with backbuild--0

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-3
   refactored arch_build_library_revision out of arch_library_add()

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-4
   Fixed syntax.  Now it can build.

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-5
   Added revision building, made it work backwards properly

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-6
   Merged to get bugfix

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-7
   Fixed chatter message

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-8
   Merges w/ Robert Collins through backbuild-0

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-9
   Star-merged with backbuild (gcc warning fixes, cleanups)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-10
   Merges from Robert, conflict fixes

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-11
   Merged the scan_archive work (and a merge with integration)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-12
   Whoops, that didn't compile!  Reversing it for now.

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-13
   Got it building by disabling check for revlibs

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-14
   Removed code related to library-based building

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-15
   Moved all code from arch_build_revision to build_revision

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-16
   Restored hard-linking between library revisions

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-17
   Merged my chatter updates

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-18
   Actually, I really fixed the bug here first, and back-ported it...

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-19
   Applied the build fixes from backbuild-0

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-20
   Fixed includes, unused variables, int -> void return types

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-21
   Applied fix from backbuild-0

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-22
   Merge from backbuild-0 (all related to missing ancestors)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-23
   Ported fixes from backbuild--0

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-24
   Merged the delta-to-tom patch from backbuild-0

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-25
   Fixes for earlier merge (invocation of build_revision)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-26
   Added missing include

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-27
   Changed arch->name to arch->official name where it seemed to make sense

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-28
   Applied backbuild--0 name fixes

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-29
   Merged patches from smallstuff (they were sure to cause conflicts)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-30
   Removed unused variables

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-31
   <no summary provided>

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-32
   backbuild--0: Removed some backbuilder chatter

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-33
   Merge from backbuild-0 (mid-version import revisions)

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1--patch-34
   arch_build_revision returns true only if revision was not patched.

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--backbuild--1.2--base-0
   Ported backbuilder to baz

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--devel--0--patch-11
   Removed some backbuilder chatter

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--local--1.2--patch-45
   Refactored arch_build_revision, preparing for backwards build

 * aaron.bentley@utoronto.ca--tla-2004/tlasrc--local--1.2--patch-46
   Fixed bug determining previous revision data, and whitespace 

 * robert.collins@canonical.com--general/bazaar--backbuilder--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--patch-5

 * robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-1
   update the backbuilder to the 1.2 codebase, tests currently failing

 * robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-2
   teach the sftp layer about soft errors, and teach arch_connect_soft in build-revision about arch_archive_connect_ext

 * robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-3
   remove an unneeded tree copy which coincidently breaks the test suite with the back builder in place

 * robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-4
   minor code layour tweak

 * robert.collins@canonical.com--general/bazaar--backbuilder--1.2--patch-5
   merge up to latest 1.2 code

